configs: remove CONFIG_SYS_MVFS

This was being used by some Marvell boards to enable some file system
related features (many of which have already been moved to Kconfig).
Make the future migration of the final 2 or 3 config options easier by
expanding #define CONFIG_SYS_MVFS into the options that it enables and
remove CONFIG_SYS_MVFS.

Signed-off-by: Chris Packham <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
Signed-off-by: Stefan Roese <[email protected]>

diff --git a/README b/README
index df1d5d67b4ad72f9aab79b7195609423e3c6d64f..fb331f910d0cf73c7a6f33212a33febb589d14b2 100644 (file)
--- a/README
+++ b/README
@@ -331,11 +331,6 @@ The following options need to be configured:
 
 - Board Type:  Define exactly one, e.g. CONFIG_MPC8540ADS.
 
-- Marvell Family Member
-               CONFIG_SYS_MVFS         - define it if you want to enable
-                                         multiple fs option at one time
-                                         for marvell soc family
-
 - 85xx CPU Options:
                CONFIG_SYS_PPC64
 

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 5b78785ee255ce0161f2cc016838def363571658..dec71038bf219ee932dd677a9bbe65d0af3f155a 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -27,7 +27,8 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 #define CONFIG_NR_DRAM_BANKS           1
 

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 5b444542f4e9d12b0fbc9c1ce9e0b42fcb192f6f..27308c92ffb99a55cde2ed7629d2db68453abcd3 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -61,7 +61,8 @@
 #endif
 
 /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 1d9fe29f9ed4b3846793392d4296b050843bd2d8..8b05e0a53d7143f48e170d7068cffc3d7eab5dab 100644 (file)
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -41,7 +41,8 @@
  * Commands configuration
  */
 
-#define CONFIG_SYS_MVFS         /* Picks up Filesystem from mv-common.h */
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index d59cddb002e55646dea21a3c283d529812238d7d..9e7ca60f112f2b4b24110c8c6ebb703a24d082ae 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -17,7 +17,9 @@
 /*
  * Standard filesystems
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_BZIP2
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-plug-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 5f071d02b7397712edba1ea2aa3ef4f26c6b9d8b..a7643166f417c77cbb4cb184aaf5613437ca02b5 100644 (file)
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -26,7 +26,8 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 66131cca622b0b406b85b18a22fbb001837d3726..1fe4618da5e5f11058f215b8f94fa661c507b312 100644 (file)
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -28,7 +28,8 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index c7673838faf2f231d1a029a41dd50157fcce2cb0..79d61c599e54e4e2c30d776a61557d75c986b038 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -97,12 +97,4 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #endif
 
-/*
- * File system
- */
-#ifdef CONFIG_SYS_MVFS
-#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-#endif
-
 #endif /* _MV_COMMON_H */

diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
index fa2b59559205ecec67ec5fb2664ad66d99bf3b37..81c07a889a36b600b6b47cdde0cb27590637906b 100644 (file)
--- a/include/configs/mv-plug-common.h
+++ b/include/configs/mv-plug-common.h
@@ -16,13 +16,6 @@
 /* Add target to build it automatically upon "make" */
 #define CONFIG_BUILD_TARGET     "u-boot.kwb"
 
-/*
- * Compression configuration
- */
-#ifdef CONFIG_SYS_MVFS
-#define CONFIG_BZIP2
-#endif /* CONFIG_SYS_MVFS */
-
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 4c320522d2f77d49341ada28a621ba2ec15d99c5..2f90439383418422751d17f5333e536ee5a1e03d 100644 (file)
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -22,7 +22,8 @@
 #define CONFIG_BZIP2
 
 /* commands configuration */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index dfdad56dcc927fea69cc661384e1224918d5d04e..aa5425af02ea0666e42b18276107fcbd7e726785 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -23,7 +23,8 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 0416baef452ab5a2cedeceb2db86f64f4a0f5818..a654df6d6f856e4884e4e676d2b0c4103641f67d 100644 (file)
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -27,7 +27,8 @@
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-common.h should be defined after CMD configs since it used them

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 656db45adf19e3b422ab219b94e19fd10ff25041..23dd5ceb7cb97600e61e752a865a3d853d1353dc 100644 (file)
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -21,7 +21,9 @@
 /*
  * Standard filesystems
  */
-#define CONFIG_SYS_MVFS
+#define CONFIG_BZIP2
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_MTD_PARTITIONS
 
 /*
  * mv-plug-common.h should be defined after CMD configs since it used them

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 705ed89a659f7bbe414fe1f961ce54dd9c8c7f2f..aa6dec0c7bf6b52bb14f50d3eaeb4a51d740fbd7 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3578,7 +3578,6 @@ CONFIG_SYS_MSC0_VAL
 CONFIG_SYS_MSC1_VAL
 CONFIG_SYS_MSC2_VAL
 CONFIG_SYS_MTDPARTS_RUNTIME
-CONFIG_SYS_MVFS
 CONFIG_SYS_MX5_CLK32
 CONFIG_SYS_MX5_HCLK
 CONFIG_SYS_MX6_CLK32